Replace a couple of inappropriate calls to GTK_WIDGET_HAS_FOCUS() with

Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to
	GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)

diff --git a/ChangeLog b/ChangeLog
index b0fe0d9b42afcca7d12472faf5d4db90ffa688d7..42496c31d92011f3a96fa0c356d3282bfe8bd1d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+       GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b0fe0d9b42afcca7d12472faf5d4db90ffa688d7..42496c31d92011f3a96fa0c356d3282bfe8bd1d4 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+       GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b0fe0d9b42afcca7d12472faf5d4db90ffa688d7..42496c31d92011f3a96fa0c356d3282bfe8bd1d4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+       GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b0fe0d9b42afcca7d12472faf5d4db90ffa688d7..42496c31d92011f3a96fa0c356d3282bfe8bd1d4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+       GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b0fe0d9b42afcca7d12472faf5d4db90ffa688d7..42496c31d92011f3a96fa0c356d3282bfe8bd1d4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+       GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b0fe0d9b42afcca7d12472faf5d4db90ffa688d7..42496c31d92011f3a96fa0c356d3282bfe8bd1d4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+       GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b0fe0d9b42afcca7d12472faf5d4db90ffa688d7..42496c31d92011f3a96fa0c356d3282bfe8bd1d4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+       GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index d15c4e2c8a41ee08ca41764f6c47a1f20d7430ec..05b24dcabe700bae1635c25b4f4dd0ece40d8689 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3158,7 +3158,7 @@ gtk_widget_real_focus (GtkWidget         *widget,
   if (!GTK_WIDGET_CAN_FOCUS (widget))
     return FALSE;
   
-  if (!GTK_WIDGET_HAS_FOCUS (widget))
+  if (!gtk_widget_is_focus (widget))
     {
       gtk_widget_grab_focus (widget);
       return TRUE;
@@ -5382,7 +5382,7 @@ gtk_widget_propagate_state (GtkWidget           *widget,
       GTK_WIDGET_STATE (widget) = GTK_STATE_INSENSITIVE;
     }
 
-  if (GTK_WIDGET_HAS_FOCUS (widget) && !GTK_WIDGET_IS_SENSITIVE (widget))
+  if (gtk_widget_is_focus (widget) && !GTK_WIDGET_IS_SENSITIVE (widget))
     {
       GtkWidget *window;